optimise code and fix spacing