Fixed comments/ code cleanup