Remove strict flags, Adhere to Single Responsibilty