Make nice method to inline
clean up old and unused methods
rename calendar vars to be more useful