Some cleanup with macros and includes
Description extended, added repo link