Refactoring: Removed comments, moved code blocks into single line