Code butified and ready to push