Improve HAML