Code Clean Up and added Pointer config option

Title really says it all.