Code Cleaning, Ver. 0.0.2_4

Cleaned up code.