+ cleanup code
+ remove commented code section