added haml, minor code cleanup