Cleared and commented code