Code cleans up