Cleaned a bit up in all .cs files and enforced some guidelines