Modified to conform to style-guide better