Added permissions, some reformatting
Cleanup