Just come cleanup
Split up functions for simple method