Tidy up the code
Remove placeholders