Further refactoring
Trailing semicolon unessessary with function syntax