Core/Controller - Beautification