Fixed indent and added macros