Code Clean Fix