Cleaned up Boot

+ import for case objects (shorter code)
+ change if to match
+ comments