Refactor names and white spaces