V0.4.8: [updated] Refactored & reformat code. Code clean up.