removed rx libraries
indentation changes
minor code cleanup