clean up code; finalize layout