Code Improvments.