starting to clean up the markup..geez..