Whitespace stuff and improved code method