Code Improvement - Clean up and slightly more efficient.