Added comments, renamed variables, removed method stubs