Clean up maki code