Continuing to structure layout of code