Clarified the code layout a bit more