Removed my redundant and commented code