Started to implement selective coding / code cleanup