Refactor: slightly better naming. Fixing alignment