Fixed comments (need proper documentation)