cleanup
Moving from hard coded style to standard