Restructured code - added support for small switches and different styles