Refactoring. Code clean up.