Fixed broken code with ';', Refactoring