Compiles on my labtop
Style fixes