Code cleanup and spacing