better navigation + code cleanup