Cleaned up style to match project