Reformatted code and deleted unwanted folders
Simplified condition operators