styling and removed hardcoded stuff