Cleaned up code: removed notes.