Code cleaning + comments