Cleaned code and added interior windows