Fix & Tidy Build