Code Clean Up and Convenience Methods