Processed comments

switched to using switch and adapted comments.