Semi Automatic Code Review

Refactoring