Improve readability, move mamp