fix alignment, tech debt