Final commit
Added comments and removed repeated methods.