V1.1 refactor

Need a newline here (sorry for petty whitespace comment)