Formatting and Import

May have to fix my formatter... Looks a bit weird...