Cleaned commented code