diff --git a/.astylerc b/.astylerc
index 82ce783..b208b76 100644
--- a/.astylerc
+++ b/.astylerc
@@ -10,16 +10,14 @@
 # Use -j as it was changed in astyle from brackets to braces, this way it is compatible with older astyle versions
 -j
 
-# 4 spaces, no tabs
+# 4 spaces, convert tabs to spaces
 indent=spaces=4
 convert-tabs
 
+# Indent switches and cases
 indent-switches
 indent-cases
 
-# Comments should be indented
-indent-col1-comments
-
 # Remove spaces in and around parentheses
 unpad-paren
 
@@ -31,12 +29,6 @@
 align-pointer=name
 align-reference=name
 
-# Attach { to the classes and namespaces
+# Attach { for classes and namespaces
 attach-namespaces
 attach-classes
-
-# add braces to one liners
-add-braces
-
-# Don't limit spaces in a continous statement (default is 40)
-max-instatement-indent=120