Code

Code cleanup