Single framework file
Mostly whitespace & syntax improvements