Final Build (Cleaned up code)