Minor positioning modifications, clean up / clarification of code comments