Fix indentation.
Pull cake code out into seperate plugin.