Cleaned comments and removed unnecessary methods.