Renaming and cleaing up CSS to prepare for styling