Code clean up, will attempt to remove inline style library functions.