Cleaned up method annotations