Refactored;
Code cleanup.