Cleaning up my markup