More coding styling