Small touches for code to look better