switch syntax
remove warnings