First pass at styling
cleanup