Move atom macros to atom section and shortened them.