Committing cleaned up code from last LD