Attempting to get it to compile, style tweaks