Some clean up (Thanks Chris)